range: Use dispose instead of destroy
authorMatthias Clasen <mclasen@redhat.com>
Tue, 5 May 2020 20:49:33 +0000 (16:49 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 5 May 2020 22:23:54 +0000 (18:23 -0400)
The destroy vfunc is going away.

gtk/gtkrange.c

index d6995fce4cdb4b5cffecb40c7df3243b9e9259e0..95c728a4fe91fe60e0bd73eb684c5cbf67d2c308 100644 (file)
@@ -148,7 +148,7 @@ static void gtk_range_get_property   (GObject          *object,
                                       GValue           *value,
                                       GParamSpec       *pspec);
 static void gtk_range_finalize       (GObject          *object);
-static void gtk_range_destroy        (GtkWidget        *widget);
+static void gtk_range_dispose        (GObject          *object);
 static void gtk_range_measure        (GtkWidget      *widget,
                                       GtkOrientation  orientation,
                                       int             for_size,
@@ -271,8 +271,8 @@ gtk_range_class_init (GtkRangeClass *class)
   gobject_class->set_property = gtk_range_set_property;
   gobject_class->get_property = gtk_range_get_property;
   gobject_class->finalize = gtk_range_finalize;
+  gobject_class->dispose = gtk_range_dispose;
 
-  widget_class->destroy = gtk_range_destroy;
   widget_class->measure = gtk_range_measure;
   widget_class->snapshot = gtk_range_snapshot;
   widget_class->size_allocate = gtk_range_size_allocate;
@@ -1256,9 +1256,9 @@ gtk_range_get_fill_level (GtkRange *range)
 }
 
 static void
-gtk_range_destroy (GtkWidget *widget)
+gtk_range_dispose (GObject *object)
 {
-  GtkRange *range = GTK_RANGE (widget);
+  GtkRange *range = GTK_RANGE (object);
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
 
   gtk_range_remove_step_timer (range);
@@ -1284,7 +1284,7 @@ gtk_range_destroy (GtkWidget *widget)
       priv->n_marks = 0;
     }
 
-  GTK_WIDGET_CLASS (gtk_range_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gtk_range_parent_class)->dispose (object);
 }
 
 static void